fix for vertical scrolling in case of GTK_CLIST_ADD_MOD changed pixmap

* gtk/gtkclist.c (scroll_vertical): fix for vertical scrolling in case
  of GTK_CLIST_ADD_MOD
* gtk/testgtk.c (add1000_clist): changed pixmap

diff --git a/ChangeLog b/ChangeLog
index ad27dcc699771fd423d9ad98199cb7d7ff764732..0d8b57edbc2edb1c2c752b5ef91a44da925dcab2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul 19 23:51:05 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (scroll_vertical): fix for vertical scrolling in case
+       of GTK_CLIST_ADD_MOD
+       * gtk/testgtk.c (add1000_clist): changed pixmap
+
 Sat Jul 18 22:59:04 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.h: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ad27dcc699771fd423d9ad98199cb7d7ff764732..0d8b57edbc2edb1c2c752b5ef91a44da925dcab2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Jul 19 23:51:05 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (scroll_vertical): fix for vertical scrolling in case
+       of GTK_CLIST_ADD_MOD
+       * gtk/testgtk.c (add1000_clist): changed pixmap
+
 Sat Jul 18 22:59:04 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ad27dcc699771fd423d9ad98199cb7d7ff764732..0d8b57edbc2edb1c2c752b5ef91a44da925dcab2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Jul 19 23:51:05 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (scroll_vertical): fix for vertical scrolling in case
+       of GTK_CLIST_ADD_MOD
+       * gtk/testgtk.c (add1000_clist): changed pixmap
+
 Sat Jul 18 22:59:04 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.h: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ad27dcc699771fd423d9ad98199cb7d7ff764732..0d8b57edbc2edb1c2c752b5ef91a44da925dcab2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Jul 19 23:51:05 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (scroll_vertical): fix for vertical scrolling in case
+       of GTK_CLIST_ADD_MOD
+       * gtk/testgtk.c (add1000_clist): changed pixmap
+
 Sat Jul 18 22:59:04 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.h: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ad27dcc699771fd423d9ad98199cb7d7ff764732..0d8b57edbc2edb1c2c752b5ef91a44da925dcab2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Jul 19 23:51:05 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (scroll_vertical): fix for vertical scrolling in case
+       of GTK_CLIST_ADD_MOD
+       * gtk/testgtk.c (add1000_clist): changed pixmap
+
 Sat Jul 18 22:59:04 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ad27dcc699771fd423d9ad98199cb7d7ff764732..0d8b57edbc2edb1c2c752b5ef91a44da925dcab2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Jul 19 23:51:05 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (scroll_vertical): fix for vertical scrolling in case
+       of GTK_CLIST_ADD_MOD
+       * gtk/testgtk.c (add1000_clist): changed pixmap
+
 Sat Jul 18 22:59:04 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ad27dcc699771fd423d9ad98199cb7d7ff764732..0d8b57edbc2edb1c2c752b5ef91a44da925dcab2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Jul 19 23:51:05 1998  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (scroll_vertical): fix for vertical scrolling in case
+       of GTK_CLIST_ADD_MOD
+       * gtk/testgtk.c (add1000_clist): changed pixmap
+
 Sat Jul 18 22:59:04 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.h: 

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index bf67c5760d7835cd06a93d02eed7eeb2291408d5..1844e6a31e914d2889cf12c723c5e4ca270ede1a 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -5250,14 +5250,12 @@ scroll_vertical (GtkCList      *clist,
            }
        }
 
-      if (clist->selection_mode == GTK_SELECTION_EXTENDED &&
-         GTK_CLIST_ADD_MODE (clist))
-       return;
-
       switch (gtk_clist_row_is_visible (clist, clist->focus_row))
        {
        case GTK_VISIBILITY_NONE:
-         if (old_focus_row != clist->focus_row)
+         if (old_focus_row != clist->focus_row &&
+             !(clist->selection_mode == GTK_SELECTION_EXTENDED &&
+               GTK_CLIST_ADD_MODE (clist)))
            select_row (clist, clist->focus_row, -1, NULL);
          switch (scroll_type)
            {
@@ -5296,7 +5294,9 @@ scroll_vertical (GtkCList      *clist,
            }
 
        default:
-         if (old_focus_row != clist->focus_row)
+         if (old_focus_row != clist->focus_row &&
+             !(clist->selection_mode == GTK_SELECTION_EXTENDED &&
+               GTK_CLIST_ADD_MODE (clist)))
            select_row (clist, clist->focus_row, -1, NULL);
          break;
        }

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index a9805e260d9d779ef2f05a4d2a74dd88f7b8690f..2fd6ef85811f188e5d530f87a887189d4107309e 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -3039,6 +3039,77 @@ create_list (void)
  * GtkCList
  */
 
+static char * book_open_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c #808080",
+"o      c white",
+"                ",
+"  ..            ",
+" .Xo.    ...    ",
+" .Xoo. ..oo.    ",
+" .Xooo.Xooo...  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+"  .Xoo.Xoo..X.  ",
+"   .Xo.o..ooX.  ",
+"    .X..XXXXX.  ",
+"    ..X.......  ",
+"     ..         ",
+"                "};
+
+static char * book_closed_xpm[] = {
+"16 16 6 1",
+"       c None s None",
+".      c black",
+"X      c red",
+"o      c yellow",
+"O      c #808080",
+"#      c white",
+"                ",
+"       ..       ",
+"     ..XX.      ",
+"   ..XXXXX.     ",
+" ..XXXXXXXX.    ",
+".ooXXXXXXXXX.   ",
+"..ooXXXXXXXXX.  ",
+".X.ooXXXXXXXXX. ",
+".XX.ooXXXXXX..  ",
+" .XX.ooXXX..#O  ",
+"  .XX.oo..##OO. ",
+"   .XX..##OO..  ",
+"    .X.#OO..    ",
+"     ..O..      ",
+"      ..        ",
+"                "};
+
+static char * mini_page_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c white",
+"o      c #808080",
+"                ",
+"   .......      ",
+"   .XXXXX..     ",
+"   .XoooX.X.    ",
+"   .XXXXX....   ",
+"   .XooooXoo.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   ..........o  ",
+"    oooooooooo  ",
+"                "};
+
 #define TESTGTK_CLIST_COLUMNS 20
 static gint clist_rows = 0;
 static GtkWidget *clist_omenu;
@@ -3052,10 +3123,10 @@ add1000_clist (GtkWidget *widget, gpointer data)
   GdkBitmap *mask;
   GdkPixmap *pixmap;
   
-  pixmap = gdk_pixmap_create_from_xpm (GTK_CLIST (data)->clist_window, 
-                                      &mask, 
-                                      &GTK_WIDGET (data)->style->white,
-                                      "3DRings.xpm");
+  pixmap = gdk_pixmap_create_from_xpm_d (GTK_CLIST (data)->clist_window, 
+                                        &mask, 
+                                        &GTK_WIDGET (data)->style->white,
+                                        mini_page_xpm);
 
   for (i = 0; i < TESTGTK_CLIST_COLUMNS; i++)
     {
@@ -3601,77 +3672,6 @@ create_clist (void)
  * GtkCTree
  */
 
-static char * book_open_xpm[] = {
-"16 16 4 1",
-"       c None s None",
-".      c black",
-"X      c #808080",
-"o      c white",
-"                ",
-"  ..            ",
-" .Xo.    ...    ",
-" .Xoo. ..oo.    ",
-" .Xooo.Xooo...  ",
-" .Xooo.oooo.X.  ",
-" .Xooo.Xooo.X.  ",
-" .Xooo.oooo.X.  ",
-" .Xooo.Xooo.X.  ",
-" .Xooo.oooo.X.  ",
-"  .Xoo.Xoo..X.  ",
-"   .Xo.o..ooX.  ",
-"    .X..XXXXX.  ",
-"    ..X.......  ",
-"     ..         ",
-"                "};
-
-static char * book_closed_xpm[] = {
-"16 16 6 1",
-"       c None s None",
-".      c black",
-"X      c red",
-"o      c yellow",
-"O      c #808080",
-"#      c white",
-"                ",
-"       ..       ",
-"     ..XX.      ",
-"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
-".ooXXXXXXXXX.   ",
-"..ooXXXXXXXXX.  ",
-".X.ooXXXXXXXXX. ",
-".XX.ooXXXXXX..  ",
-" .XX.ooXXX..#O  ",
-"  .XX.oo..##OO. ",
-"   .XX..##OO..  ",
-"    .X.#OO..    ",
-"     ..O..      ",
-"      ..        ",
-"                "};
-
-static char * mini_page_xpm[] = {
-"16 16 4 1",
-"       c None s None",
-".      c black",
-"X      c white",
-"o      c #808080",
-"                ",
-"   .......      ",
-"   .XXXXX..     ",
-"   .XoooX.X.    ",
-"   .XXXXX....   ",
-"   .XooooXoo.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   ..........o  ",
-"    oooooooooo  ",
-"                "};
-
 GdkPixmap *pixmap1;
 GdkPixmap *pixmap2;
 GdkPixmap *pixmap3;

diff --git a/tests/testgtk.c b/tests/testgtk.c
index a9805e260d9d779ef2f05a4d2a74dd88f7b8690f..2fd6ef85811f188e5d530f87a887189d4107309e 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -3039,6 +3039,77 @@ create_list (void)
  * GtkCList
  */
 
+static char * book_open_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c #808080",
+"o      c white",
+"                ",
+"  ..            ",
+" .Xo.    ...    ",
+" .Xoo. ..oo.    ",
+" .Xooo.Xooo...  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+"  .Xoo.Xoo..X.  ",
+"   .Xo.o..ooX.  ",
+"    .X..XXXXX.  ",
+"    ..X.......  ",
+"     ..         ",
+"                "};
+
+static char * book_closed_xpm[] = {
+"16 16 6 1",
+"       c None s None",
+".      c black",
+"X      c red",
+"o      c yellow",
+"O      c #808080",
+"#      c white",
+"                ",
+"       ..       ",
+"     ..XX.      ",
+"   ..XXXXX.     ",
+" ..XXXXXXXX.    ",
+".ooXXXXXXXXX.   ",
+"..ooXXXXXXXXX.  ",
+".X.ooXXXXXXXXX. ",
+".XX.ooXXXXXX..  ",
+" .XX.ooXXX..#O  ",
+"  .XX.oo..##OO. ",
+"   .XX..##OO..  ",
+"    .X.#OO..    ",
+"     ..O..      ",
+"      ..        ",
+"                "};
+
+static char * mini_page_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c white",
+"o      c #808080",
+"                ",
+"   .......      ",
+"   .XXXXX..     ",
+"   .XoooX.X.    ",
+"   .XXXXX....   ",
+"   .XooooXoo.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   ..........o  ",
+"    oooooooooo  ",
+"                "};
+
 #define TESTGTK_CLIST_COLUMNS 20
 static gint clist_rows = 0;
 static GtkWidget *clist_omenu;
@@ -3052,10 +3123,10 @@ add1000_clist (GtkWidget *widget, gpointer data)
   GdkBitmap *mask;
   GdkPixmap *pixmap;
   
-  pixmap = gdk_pixmap_create_from_xpm (GTK_CLIST (data)->clist_window, 
-                                      &mask, 
-                                      &GTK_WIDGET (data)->style->white,
-                                      "3DRings.xpm");
+  pixmap = gdk_pixmap_create_from_xpm_d (GTK_CLIST (data)->clist_window, 
+                                        &mask, 
+                                        &GTK_WIDGET (data)->style->white,
+                                        mini_page_xpm);
 
   for (i = 0; i < TESTGTK_CLIST_COLUMNS; i++)
     {
@@ -3601,77 +3672,6 @@ create_clist (void)
  * GtkCTree
  */
 
-static char * book_open_xpm[] = {
-"16 16 4 1",
-"       c None s None",
-".      c black",
-"X      c #808080",
-"o      c white",
-"                ",
-"  ..            ",
-" .Xo.    ...    ",
-" .Xoo. ..oo.    ",
-" .Xooo.Xooo...  ",
-" .Xooo.oooo.X.  ",
-" .Xooo.Xooo.X.  ",
-" .Xooo.oooo.X.  ",
-" .Xooo.Xooo.X.  ",
-" .Xooo.oooo.X.  ",
-"  .Xoo.Xoo..X.  ",
-"   .Xo.o..ooX.  ",
-"    .X..XXXXX.  ",
-"    ..X.......  ",
-"     ..         ",
-"                "};
-
-static char * book_closed_xpm[] = {
-"16 16 6 1",
-"       c None s None",
-".      c black",
-"X      c red",
-"o      c yellow",
-"O      c #808080",
-"#      c white",
-"                ",
-"       ..       ",
-"     ..XX.      ",
-"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
-".ooXXXXXXXXX.   ",
-"..ooXXXXXXXXX.  ",
-".X.ooXXXXXXXXX. ",
-".XX.ooXXXXXX..  ",
-" .XX.ooXXX..#O  ",
-"  .XX.oo..##OO. ",
-"   .XX..##OO..  ",
-"    .X.#OO..    ",
-"     ..O..      ",
-"      ..        ",
-"                "};
-
-static char * mini_page_xpm[] = {
-"16 16 4 1",
-"       c None s None",
-".      c black",
-"X      c white",
-"o      c #808080",
-"                ",
-"   .......      ",
-"   .XXXXX..     ",
-"   .XoooX.X.    ",
-"   .XXXXX....   ",
-"   .XooooXoo.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   .XooooooX.o  ",
-"   .XXXXXXXX.o  ",
-"   ..........o  ",
-"    oooooooooo  ",
-"                "};
-
 GdkPixmap *pixmap1;
 GdkPixmap *pixmap2;
 GdkPixmap *pixmap3;